Repository navigation
xhci: drop the VL805 XHCI_EP_CTX_BROKEN_DCS cycle-state quirk - #7754
Conversation
Upstream commit 6328bdc ("usb: xhci: Don't trust the EP Context cycle bit when moving HW dequeue") fixed the VL805 DCS write-back problem by seeding new_cycle from td->end_trb and counting link TRB toggles only after end_trb. The downstream quirk still seeds new_cycle from the TRB at the hardware dequeue pointer, which can be before a cycle-toggling link TRB inside the cancelled TD. That toggle is then never counted, Set TR Dequeue is given the previous lap's cycle bit, and the endpoint stalls until a USB reset. Remove the quirk; upstream's handling covers the VL805. Link: raspberrypi#7737 Signed-off-by: Dom Cobley <dom@raspberrypi.com>
|
@P33M can you check |
|
I think the change is correct. Upstream fixed it a different way, now the downstream patch is unneccessary. |
|
@P33M Confirmed with a local A/B test on the same Raspberry Pi 4 / VL805 and USB device, using the original reproducer from #7737:
Both runs used the same Lexar The PR kernel is now restored and running. This reproduces the specific endpoint stall and confirms the PR passes its regression test on this setup; it does not establish whether this bug caused our earlier whole-host hang. |
|
Original reported also reported success. @pelwell ? |
kernel: spi: rp2040-gpio-bridge: Fix fast_xfer with strict RP1 pinmux See: raspberrypi/linux#7728 kernel: drm/vc4: hdmi: Reset the MAI FIFO when preparing audio See: raspberrypi/linux#7751 kernel: configs: Enable NET_SWITCHDEV and ADIN1110 support See: raspberrypi/linux#7687 kernel: drm/vc4: Use the HVS field bit for interlaced scanout position See: raspberrypi/linux#7763 kernel: xhci: drop the VL805 XHCI_EP_CTX_BROKEN_DCS cycle-state quirk See: raspberrypi/linux#7754
kernel: spi: rp2040-gpio-bridge: Fix fast_xfer with strict RP1 pinmux See: raspberrypi/linux#7728 kernel: drm/vc4: hdmi: Reset the MAI FIFO when preparing audio See: raspberrypi/linux#7751 kernel: configs: Enable NET_SWITCHDEV and ADIN1110 support See: raspberrypi/linux#7687 kernel: drm/vc4: Use the HVS field bit for interlaced scanout position See: raspberrypi/linux#7763 kernel: xhci: drop the VL805 XHCI_EP_CTX_BROKEN_DCS cycle-state quirk See: raspberrypi/linux#7754
Fixes #7737.
Upstream 6328bdc ("usb: xhci: Don't trust the EP Context cycle bit when moving HW dequeue") already handles the VL805 not updating the endpoint DCS. The older downstream quirk still seeds the cycle state from the TRB at the hardware dequeue pointer. When a cancelled TD spans the cycle-toggling link TRB, that toggle is never counted. Set TR Dequeue then gets the wrong cycle bit and the endpoint stalls until a USB reset.
This removes the quirk, which matches rpi-7.3.y: that branch no longer sets
XHCI_EP_CTX_BROKEN_DCSfor the VL805.Tested on a Pi 4 with a USB SD card reader, using the reproducer script from #7737: